Merge "disable carrier actions on redirection by default" into oc-mr1-dev