Merge "Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev am: 6321f42fbe am: a80c867adf" into nyc-mr1-dev-plus-aosp