Merge "Add back legacy layout for preference framework for compatibility." into honeycomb