Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev