Merge "Revert "B5 only supports 2 camera_vsync"" into qt-qpr1-dev