Merge commit '0457db37de22d430df0e55a7552dcfe81b701627' * commit '0457db37de22d430df0e55a7552dcfe81b701627': Use the private version of userActivity.
Merge commit '0457db37de22d430df0e55a7552dcfe81b701627' * commit '0457db37de22d430df0e55a7552dcfe81b701627': Use the private version of userActivity.