Merge "Merge "Minor touch changes for resizing" into rvc-dev am: 813ac747b6 am: 2c1419358d" into rvc-d1-dev-plus-aosp