Merge "Rescan apps after restore and re-publish manifest shortcuts" into nyc-mr1-dev am: a63469076e am: dabb164cc2
am: a37443aa3b

Change-Id: I2381299daf1c6369e9a26e9ce4d582df681921d1