am 3b5f5f28: Fix regression wherein correct activity flags weren\'t being set

* commit '3b5f5f28b27c6bcbcc5c43fe0b3f57d63e01323b':
  Fix regression wherein correct activity flags weren't being set