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

Change-Id: I7690249ea06347b5ecf1c58528710b426dc323c2