Merge "Move notifying powerManager userActivity to background thread" into main