Merge "underline is now only tracked by android"