Merge "Remove placeholder code for scrolling screenshots" into rvc-dev