Merge "AAPT2: Add Proguard rules for nav fragments"