Merge "Clean up bubble text view test so that the feature flag is off at the end" into tm-qpr-dev