Merge "Update hint text color even when text present" into lmp-mr1-dev