Merge "Set text color in the KeyguardIndication" into udc-dev