Merge "Fix regression NPE in PlaybackControlGlue"