Merge "WM: Defer transactions for BLAST Surfaces too."