Merge "App Pairs (behind flag): Add new ItemInfo types and DB save functionality" into udc-dev