Merge "If device isn't on the keyguard, always use sfps blue colors" into udc-dev