Merge "Select task is broken on display large size" into main