Merge "Fix action item text appearance pre-v23" into mnc-ub-dev