Merge "Fix janky add guest transition" into mnc-dev