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

* commit '87480a3bc0b3b6ccafc934939a9b6e2ebfaf5f1f':
  Support persistent focus on the playback controls row.