Merge "Update unseen filter setting access to account for tri-state" into tm-qpr-dev