Merge "Added idlescreen timeout" into main