Merge "Revert "Use real screen size to scale duration""