Merge "sync staged flags over to system properties" into main