Merge "[ActivityManager] Fix NPE when start activity"