Merge "Fix requestLayout-during-layout problems"