am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev

* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.