Merge "Fix condition for showing contraste tile" into main