Merge "Handle activity launch for background users"