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

* commit 'e0ff1ed6f4541a0ade80036058a0c91925708b80':