Merge "Hide shortcut helper on settings/recentapps launch" into main