Merge "Fix pause work apps button being higher than normal" into tm-qpr-dev