Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread