Merge "Respect feature flag when providing Pip controller"