Merge "Add support for adding preference summary when disabled by admin."