Merge "SurfaceView: Restore transaction application in useBLAST=false" into sc-dev