Merge "Remove static activity instance" into jb-ub-mail-ur8