Merge "Minor touch changes for resizing" into rvc-dev