Merge "Invoke requestLayout() when drawables have different sizes. Bug #5142668"