Merge "Fix regression which was causing requestLayout in layout pass" into ub-now-porkchop