Merge "Revert "Pass $context to 'GetPreferences' hook""