Merge "Ensure snapshot orientation matches snapshot buffer size" into qt-dev am: c8dca90aa7
am: 6c1f408505

Change-Id: I0e980eafb942dc85b13421874bc9c856dfd06502