Adding support for highlighting preference in sub-screens

Change-Id: I1d5c0a7457a31755951b2f6be70a61a2d84463cf
4 files changed