Merge "Fix InstantAppRegistry for secondary users."