Merge "Make focus task a bit bigger" into sc-dev