Merge "Add function to update SysUiScrim duration for tests" into udc-qpr-dev