Merge "Fix attribute extraction, use color attrs in Quantum drawables"