Merge "Don't acquire WM service lock in ActivityStackSupervisor.resolveIntent()"