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