Merge "Update screen timeout again."