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