Merge "Freezer: fix delayed freezing operation" into sc-dev