Merge "Camera: make sure preview won't slow down video" into mnc-dev