Merge "Don't create gap between last task and clear all button" into sc-v2-dev