Merge "Revert^2 "Remove setFrame from BufferStateLayer"" into sc-dev