Merge "Clear data after calling ViewGroup#buildOrderedChildList" into sc-dev