Merge "Move task to the bottom when force hidden" into sc-dev