Merge "Support "Independent system keyboard haptics settings"" into main