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