Merge "Password field colors" into oc-dr1-dev