Merge "Move res/drawable-television out of SystemUI" into main