Merge "Add null pointer check to getStopped" into sc-dev