am e184aabe: am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev

* commit 'e184aabe42545282c3c9594707c6fa12dbe8fef4':
  Fix QS switch accessibility problem