Merge "Change adding focus indicator logic" into devel/master