am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit

* commit 'e4ccb341d890e01e1f365c1ed8880a581985c034':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.