Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev
am: 02f8fa9603

Change-Id: Ic46388c35651217b7f39b12aec8ba1a34f537d36