Merge "[PhysicalKeyboard] Update Setting Feature Provider for follow up usage" into main