Merge "Restore getAccessibleMethod in the preferences inflater"