Merge "Hide shortcut helper on all apps" into 24D1-dev