Merge "Ensure snapshot orientation matches snapshot buffer size" into qt-dev