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