Merge "Add support for appcompat preferences rendering"