layout: Do not delay mapping of desktop surface until commit time