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

* commit 'fb4f4cd3139f19402aa59725f41417e00c715366':
  Fix touch target for settings icon