Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c' * commit '2e47052fc4ad3439adc2322fd953fd58a85d457c': Fix problems with determining when to kill apps for wake usage.
Merge commit '2e47052fc4ad3439adc2322fd953fd58a85d457c' * commit '2e47052fc4ad3439adc2322fd953fd58a85d457c': Fix problems with determining when to kill apps for wake usage.