ThemePickerLeaf: Update for U QPR2

Change-Id: I0746f89bf6b0d761b8fbb0093ed3608b19ecbe8f
12 files changed