Merge "Prevent leak of AppWindowTokens." into oc-dev