Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev am: ab762775d5
am: 2d574c0669

Change-Id: I42020ba8bf81264ef2c92a74ee1cf64609f7b0d7