Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity."