Merge "init: Fix sync issue on property trigger."