Merge "Implement hub mode user activity timeout" into main