Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev