am 89dfebe7: (-s ours) am 10aa8f12: am 9dcb764f: Fix "Show settings key" option on 7" device (DO NOT MERGE) * commit '89dfebe7': Fix "Show settings key" option on 7" device (DO NOT MERGE)