Merge "Don't request a layout during layout." into jb-dev