Merge "SwitchCompat: Fix NPE on makeLayout()"