Merge "Avoid extra HEADs for stash clearing"