Merge "hwc2: Add support for optional user preferences"