Merge "Promote mWindowContextToken to TestApi" into sc-dev