Merge "Allow "shortcut manager" icons to be returned to apps" into nyc-dev