Revert "Fix subtext didn't change after toggle changed"

This reverts commit 5d333991.

Reason for revert: Subtext must display from its resource xml file, don't just show on/off.

Change-Id: I57a647be1aa2da881caf444c36991da0cdff73f6