Merge "Turn off filter ui if flag is off" into tm-qpr-dev