Merge "Camera: skip unnecessary reconfig" am: b9e732b490
am: f694dc1b4a

Change-Id: Ie9156f4613923811fc4b510e804e4dd8b86170bb