am cac75a8b: am cf29e8a8: am 67ef1c40: Merge "Fix regression which was causing requestLayout in layout pass" into ub-now-porkchop

* commit 'cac75a8b7797086a34e2d50b69b36d0ecad37f9b':