Merge "New taskbar thresholds." into tm-qpr-dev