Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev