Merge "Fix QS header constraints so status icons are now ellipsized where there is lack of space." into tm-qpr-dev