am 863d1ac9: (-s ours) am 1cbfc6c9: DO NOT MERGE. Follow up change to...
am 863d1ac9: (-s ours) am 1cbfc6c9: DO NOT MERGE. Follow up change to I8b38e280 Add visual indicator that long press / or @ on F1 key will bring up Settings
Merge commit '863d1ac9'
* commit '863d1ac9':
DO NOT MERGE. Follow up change to I8b38e280