am 25dea652: am 41402867: am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev

* commit '25dea652a0fe7c5c7d210c36a32d4c451e4f8983':
  Fix touch target for settings icon