Merge "AOD: Limit visible icons on shelf" into oc-dev
am: 6b7c0e9da8

Change-Id: Ife25cd6f91ec6997267e8fdd6b82b78b4bac8223