Merge "Make measureText(String, int, int) not use context" into mnc-dev