Merge "Prevent NPE in MediaSessionService" into mnc-dev