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

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