Merge "Merge "Only need to dismiss stage if one of the task is closed." into udc-dev am: 54d018e1de am: b22d16a188"