Merge "Merge "QS Edit: fix some move logic" into nyc-dev am: 8e788d01 am: 53f44f56" into nyc-mr1-dev-plus-aosp