Merge "Merge "Only handle resize touches if starting gesture within resize area" into rvc-dev am: dccddad3 am: 1b507db1 am: 00ffec8e" into rvc-qpr-dev-plus-aosp