Merge "Prevent NPE in MediaSessionService"