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

* commit '661794307a792690d7608dc81b4e1299937a8f67':
  Fix QS switch accessibility problem