Merge "Remove double focus ring on TV volume UI seekbar" into main