Merge "Use EXTRA_USER to get user from ACTION_USER_SWITCHED"