Highlight selected option in FX and Borders

  Bug: 8791729

Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
7 files changed