am 5446b281: (-s ours) am 86953d17: DO NOT MERGE.  Revise the setting hint visual and its handling code. This is a follow up change to I8b38e280.

Merge commit '5446b281b6bef401db8e6e94805f0c9d8f52bed7'

* commit '5446b281b6bef401db8e6e94805f0c9d8f52bed7':
  DO NOT MERGE.  Revise the setting hint visual and its handling code.