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