Merge "Add ThemePicker instrumented tests to presubmit" into tm-qpr-dev