Merge "Use support lib preference style as base"