Merge "Camera2 API: fix front facing camera flip issue"