am 0df6a277: Merge "Grey out settings icon when it is in disabled state"

* commit '0df6a2771d92e355e122195d3dceaf9a2b264ee5':
  Grey out settings icon when it is in disabled state