Merge "Adds test case for keep the save UI while is showing"