Merge "RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus" into sc-dev