Merge "Don't draw default focus highlight unless focused."