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

* commit '67ef1c406cb8a288c5bcdb825a26e6020e0a6cac':
  Fix regression which was causing requestLayout in layout pass