Merge "Revert "Revert "Per user setting for instant app"""