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

Change-Id: I17eb8ec26bc58a4eb969befa71f884cb95ab9079