Merge "Only skip hierarchy op which may reorder task in task lock mode" into sc-dev