Merge "Add glare and taas to blacklist"