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

Change-Id: Icd75a843474dd613412cbc3cc083908f96fb54d0