Merge "Fix erroneous requestLayout-during-layout issues" into jb-mr2-dev