Merge "Always scan all apps after each OTA for manifest shortcuts"