Merge "Constrain child width and height to >= 0 in FrameLayout.onMeasure()" into mnc-dev