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

Change-Id: I74a206632bfe54bca9ccb0cde247d25fb6e219e7