Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev