Merge "Fix default gravity for View foreground drawables"