am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad

* commit '9db4ac802c6f635bdc56c69f20be08e054ba2926':
  Fix issue of focus indicator staying on without being hidden