Merge "Fix race condition when evaluating screen timeout."