Merge "Add a synchronous path when finishing a pre-existing recents animation" into udc-dev