Merge "Don't restore from recent task if not launching"