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

Change-Id: Idabcd2d7cb7ec94ff857377968271d3adca074a5