Merge "Restore Proguard behavior and add minimal flag"