Merge "Fix ActivityLifecycleTests to correctly get current user rotation"