Merge "Time out resume controls" into sc-qpr1-dev