Merge "FramebufferSurface: fix for limitFramebufferSize" into sc-dev