Merge "Fix issue #27920133: Need to ensure activity starts in idle maintenance" into nyc-dev