Merge "Adjust default screen timeout."