Merge "Merge "Only handle resize touches if starting gesture within resize area" into rvc-dev am: dccddad314 am: 1b507db1df am: 00ffec8e70" into rvc-qpr-dev-plus-aosp