Merge "Added configurable idlescreen timeout" into main