Merge "Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: b2a13977ea am: 46a576978a" into rvc-qpr-dev-plus-aosp