Merge "Setup device config to sys prop mapping" into main