Merge "Move theme setting out of tuner to display"