Merge "Clean up user activity handling"