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

Change-Id: I0a59b32ffbc70d24f4a1cfd911aa85287d3e3c32