am 1cbfc6c9: DO NOT MERGE. Follow up change to I8b38e280 Add visual indicator...
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 '1cbfc6c9' into gingerbread-plus-aosp
* commit '1cbfc6c9':
DO NOT MERGE. Follow up change to I8b38e280