am 4858f5fd: Merge "Don\'t request a layout during layout." into jb-dev

* commit '4858f5fde65caaa5c47f84aa9a208e48923e14fc':
  Don't request a layout during layout.