Merge "Fix CheckTextView padding"