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

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