Merge "[automerger skipped] Merge "Fix NPE when starting activity while no focused task" into rvc-qpr-dev am: 6c6907db9d am: f04f7e06c0 -s ours"