Merge "Wait for the user to fully stop before starting" into pi-dev