Merge "freezer: allow dynamic changes to freezer.state" into rvc-dev