Merge "Fix possible NPE in MediaSessionManager" into pi-dev