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