Merge "Revert "Revert "Put pm.* property in new pm_prop context"""