Merge "Fix crash coming from accessing invalid display from GestureDetector" into rvc-dev