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

Change-Id: I396254dd546aaa7fb2147d60b95cbe8075059f23