Merge "Clean up theme part 1: move attrs to attrs.xml"