Merge "Don't bother to kill large cached app if it's being launched" into sc-dev