Merge "Flush mPostDrawTransaction when WSA is torn down" into sc-dev