Merge "Fix NPE in InstantAppButtonsPreferenceController"