Merge "Theme picker polish fixes." into ub-launcher3-qt-dev
am: 355ced9b92

Change-Id: I38565b046eff58fb317e062b510dc5516e3f8bd2
tree: c599eacbb8cf4d8a50bda85c90e45423a1658049
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml