Merge "BlastBufferQueue: Keep transform hint in Surface consistent" into sc-dev