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

* commit '391be4729604674bf3a1bfc8f482d9d78c961cce':
  Fix issue #27385109: control activity behavior without triggering...