Merge "Fix unit test to allow ThemePickerTests to run as presubmit" into tm-qpr-dev