Merge "Make sensitive text/image both look the same" into tm-dev