Merge "Resume stopped preserved window when relaunching visible activity" into udc-dev