Merge "Move non-theme styles to styles.xml"