Merge "Add new bit rate for 1920x1080:240 and 1280x720:480" into camera-SnapdragonCamera.lnx.2.0