Merge "Don\'t update hint color when error is shown" into mnc-ub-dev am: 78714f9ddc
am: 8fbdbc71af

* commit '8fbdbc71af44387ffb51dd224e8e0ba1c0c943e2':
  Don't update hint color when error is shown