Merge "reorder System shortcuts for taskbar and secondary display" into tm-qpr-dev