Merge "Fix triggering One-handed mode introduces gesture conflict issues (1/n)"