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