Merge "Merge "Ensure snapshot orientation matches snapshot buffer size" into qt-dev am: c8dca90a am: 54774cad" into qt-r1-dev-plus-aosp