Merge "Add feature flag for early-screen-timeout-detector" into main