Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev