Merge "Add flag to allow remote sessions to be resumable" into tm-qpr-dev