Merge "Rename Stack to Task related terms (3/n)"