Merge "Fix issue #27385109: control activity behavior without triggering..." into nyc-dev