Merge "Use notification action to stop recording" into sc-dev