Merge "Support persistent focus on the playback controls row." into lmp-mr1-ub-dev