Merge "Update dimensions of ShortcutHelper. Fix text wrapping for large font." into main