Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev am: 4c1c7f3e am: cbd3c73f am: f659ce34 Change-Id: Ida929d96fe12149a9601ed89f6bf111732cbb90f