Merge "Fixed incorrect size and position of a snapshot starting window in waterfall device." into rvc-dev