Merge "Ensure current operation has not changed on start/stop user operations." into sc-dev