Merge "Speed up shortcut launch performance" into jb-dev