Merge "Handle some Recents finish corner cases" into udc-dev