Merge "Restoring pinned shortcuts to original state after restore" into qt-dev