Merge "Fix screen size configuration computing of task"