Merge "init: split property context into platform & non-platform components"