Merge "Update wm flicker tests to account for seen filter" into tm-qpr-dev