am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE)

* commit '10aa8f127ae4e1f9e09f26e4e54770855ff24440':
  Fix "Show settings key" option on 7" device (DO NOT MERGE)