Merge "Throw a more descriptive exception when adding null to a ViewGroup" into lmp-mr1-dev