Merge "Merge "Fix bug where screenshot jumped to the left" into rvc-dev am:...
Merge "Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d2 am: 04a79624" into rvc-d1-dev-plus-aosp am: 581c55a7 am: 6c5e6f8b
Change-Id: I9d3b567748a5c75eb56d41c71fdf8462d41e27ff