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

* commit '004970da50ddbce80321b50536625e149ff1f825':
  Grey out settings icon when it is in disabled state