ThemePicker: Fix drawing theme option border

Change-Id: Ia95cb894c487c109b47785439267eaa1e0cb7876
11 files changed