Merge "Allowing more than one app to suspend apps"