Merge "Fix text view padding issue in EmptyTextSettings" into rvc-dev