Merge "Add preference demos"