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

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