Merge "Large icons now scale nicer when expanding bundles" into nyc-mr1-dev