Merge "Handling stop() call in idle state" into sc-dev