Merge "Revert "Increase performance for screenshots by pre-loading the buffer"" into sc-dev