Merge "Revert^2 "Feature flag new "MANAGE_KEY_GESTURES" permission"" into main