Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev