am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev

* commit '4629f1c58c00480b0dbd5a541a26b703b0770bf4':
  Fix janky add guest transition