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

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