Merge "Fix crash when docking from recents."