Merge "Removing landscape string overrides" into ub-now-queens