Merge "Fix proguard error of NavigationView" into mnc-ub-dev