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

* commit '58562d37c5d83f7cab23e7730986bf99e5a11767':
  Fix touch target for settings icon