Merge "Fix deadlock in MediaSessionService during getCurrentUser()"