Merge "Ambient indicator text color" into oc-mr1-dev