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

* commit '16b7492240b92a81332e61680f51073da8af186c':
  Fix janky add guest transition