Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev