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

Change-Id: I6c6fd78b756f4835e14e657457ca264900b3862a