Merge "Fix shortcut size calcuation" into sc-dev