Merge "Add more trunk stable namespaces to the device config to sys prop mapping list" into main