Merge "Ensure ActivityManagerInternal instance is non-null"