Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev