am 2ab78dc1: Merge "Remove static activity instance" into jb-ub-mail-ur8

* commit '2ab78dc1d70550a0dad2bb10e8e8cbd08b03b0ed':
  Remove static activity instance