Merge "RTL - fix folder name padding. b/12721062." into ub-mail-master