Merge "Split taskbar test methods by persistent/transient" into tm-qpr-dev