Merge "Fix NPE in BrowsedPlayerWrapper"