Merge "apply staged property value when loading persistent props" into main