Merge "Ensure child is attached before performing measure/layout in Spinner" into mnc-dev