Merge "Revert "Tweak design proguard config"" into mnc-ub-dev