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

Change-Id: I0d1857b36106e68d7512f2ac29ac763109be2f8b