am 8bfef0d5: Merge "Focus reset delay changed from 3 to 4 seconds. Bug: 12826152" into gb-ub-photos-denali

* commit '8bfef0d567232aec9711790f66187588c67ae82a':
  Focus reset delay changed from 3 to 4 seconds. Bug: 12826152