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

* commit '9d0b4e6b950289334d2b75bdef7dd2dac98cdd8d':
  Fix regression wherein correct activity flags weren't being set