Move overrides to system.prop