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

* commit '93b6ee6dfaa954747c9b107e147d57ea4866f78d':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."