Merge "Remove custom styles that have moved to supportlib"