Merge "Add an incorrect context violation on GestureDetector" into rvc-dev