Merge "Fixed an issue where the user could be stuck with pulse expanding" into sc-v2-dev