Merge "Fix MediaFocusControl index management for PlayerRecord"