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

Change-Id: I0a05c16dda34fdb75c6f5d0a5c27e59b0ba01783