Merge "Don't lock WM when calling ActivityStackSupervisor.resolveIntent()"