Merge "Automated test fix for framebuffer creation" into devel/master