Merge "Fix saving Policy with STATE_PRIORITY_CHANNELS_BLOCKED" into main