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

* commit 'cd64757831606e5c44decc1b2e17e9a9558b0cf1':
  Fix janky add guest transition