diable screen on on unplug and increase max number of icons

Change-Id: Icb4a05ce3d853040a48518524c753d2266ec99d4