Merge "fix [3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app"