Merge "Sync TextView style with that in support library"