Merge "Camera API1: Ignore the video size change during recording" into lmp-dev