Merge "DisplayModeDirector: fix an arithmetic error"