Merge "Revert "Update Gesture/3B nav color to B/W"" into main