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

Change-Id: I7c41066da3f8a39269329729652127499402cdd9