Merge "Fixed an issue where the phone would be stuck pulseExpanding" into sc-dev