Merge "Tidy up support-v4 shim APIs pt. 2" into mnc-ub-dev