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

* commit 'b6c18ab8cc33b1e813b5e1d54441d7192da3bfec':
  Fix janky add guest transition