Merge "SnapdragonCamera: notify focus manager about surface change"