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