Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev am: 4c1c7f3e18 am: cbd3c73f6e
am: f659ce3437

Change-Id: Ida929d96fe12149a9601ed89f6bf111732cbb90f