Merge "Force externally injected tiles to use rounded icon."