Merge "Fix requestLayout() optimizations"