Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev