Merge "Move notifying userActivity to background thread in password textview" into main