Merge "Apply VectorDrawable density scaling before applying theme"