Merge "Fix sticky unfreeze app failure" into main