Merge "CameraITS: skip AF in scene5" into nyc-dev