Merge "Add a feature flag for timeout to user 0 when docked."