Merge "ShortcutHelper with Open App shortcuts tab by default  when triggered from app" into main