Merge "Update the initial expanded count for apps and notifications." into pi-dev
am: 4af11079e8

Change-Id: Idcced54ab4b705257d5c24a416c078cf24d33b30