Merge "Merge "QS Edit: announce exit/entrance" into nyc-dev am: d27ed8b336 am: 8717808f0c" into nyc-mr1-dev-plus-aosp