am f448e23f: am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit

* commit 'f448e23f12379ca43e9ca930977cf4185ca8af92':