am 09e790ac: Merge "Only use one hint color on contact editors" into mnc-dev

* commit '09e790ac8ee9f229bb189d51815062e9ad5bd1f9':
  Only use one hint color on contact editors