Merge "Don't update hint color when error is shown" into mnc-ub-dev