Bug986071 ux choose product

r? @willkg