Merge "Fix NPE when starting activity while no focused task"