Merge "Fix issue #27385109: control activity behavior without triggering..." into nyc-dev am: 391be47296
am: 171d76ada8

* commit '171d76ada84e7e4cda7f3ce68a70729ef1453877':
  Fix issue #27385109: control activity behavior without triggering...