Merge "Fix bug where screenshot jumped to the left" into rvc-dev am: aef754d253 am: 04ab8a3c02 am: da2caa7f87
Change-Id: Ie225e69160d234f89402968c9e5110515a89b681
This commit is contained in: