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
Change-Id: Icaa959293899de488beccd155150e6fd9833f926