Merge "Support Lib Preference framework"