Merge "MediaSessionService: Fix NPE" into pi-dev