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

Change-Id: I74fe8ee556cf39459e61876dccab10140e3afe04