Merge "Revert changes for disallowing user to run in background for now."