am 86e1e1f9: Merge "Support more keys accessibility mode"

* commit '86e1e1f97cc12f7671ebe1386395ac99db6201ed':
  Support more keys accessibility mode