Merge "Remove some unnecessary Proguard keep attributes" into ub-mail-master