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