Merge "Don't trigger TextView relayouts if content doesn't change" into tm-dev