Merge "Don't pre-scale vector drawables in settings" into pi-dev