Bug 3322607 Re-applying the revert that fixed the ANR (https://android-git.corp.google.com/g/#change,87129), whith an updated here value that seems to fix the problem. This layout code is pretty involved, with destabilizing variable names and uses. Althought I tested it, this fix is not 100% garanteed. Change-Id: I1f4b09b329fb8a328ae8ab26ae472e343453beda