* commit 'a3aaad1f7b4430cb7449767bb13fc1f43d688480': Add back legacy layout for preference framework for compatibility.