Merge "Fixes NPE crash when startActivityFromRecents" into tm-qpr-dev