Merge "Properly protect ShortcutPackage#mShortcuts with synchronization lock." into tm-dev