Merge "Merge "Switching launcher icon for page fragment." into nyc-dev am: fc9a4b3f53 am: 157f34aa30" into nyc-mr1-dev-plus-aosp