Merge "Add target for ThemePicker instrumented tests" into tm-qpr-dev