Merge "Move TV-specific classes out of SystemUI" into main