Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev