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