Merge "Update device config to sys prop sync" into main