Merge "Add lock task check when applying window container transaction" into sc-dev