Merge "Handle STOPPED to PAUSED Usage events" into sc-dev