Merge "Fixed incorrect size and position of a snapshot starting window in...
Merge "Fixed incorrect size and position of a snapshot starting window in waterfall device." into rvc-dev am: ae4f1360 am: 83fa44ff am: 2f42c6de am: e1901adb
Change-Id: I5d985779917bc4f57e0ccaee3f1aa8a3db16e8f1