Merge "Fix potential null deref in ViewGroup when running transition"