Merge "Don't "notifyAppStopping" when going to sleep." into pi-dev