Merge "Enable per-DisplayGroup timeouts" into sc-dev