Merge "Update shortcut view layout." into qt-r1-dev