Merge "Playback controls focus fixes." into lmp-mr1-ub-dev